iconGrid: Rename ::key-focus-in signal

As part of our quest to obsolete Shell.GenericContainer, IconGrid will
become a Clutter.Actor subclass. As the ::key-focus-in signal would
clash with Clutter.Actor::key-focus-in, rename it to ::child-focused.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/153

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 740f0c240e3c68640414b3d8b248ca1e13faeda7..9d648c92ebf3ae0b7dd669489211e1a6b25235a3 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -126,8 +126,8 @@ var BaseAppView = new Lang.Class({
         else
             this._grid = new IconGrid.IconGrid(gridParams);
 
-        this._grid.connect('key-focus-in', (grid, actor) => {
-            this._keyFocusIn(actor);
+        this._grid.connect('child-focused', (grid, actor) => {
+            this._childFocused(actor);
         });
         // Standard hack for ClutterBinLayout
         this._grid.actor.x_expand = true;
@@ -136,7 +136,7 @@ var BaseAppView = new Lang.Class({
         this._allItems = [];
     },
 
-    _keyFocusIn(actor) {
+    _childFocused(actor) {
         // Nothing by default
     },
 
@@ -717,7 +717,7 @@ var AllView = new Lang.Class({
         });
     },
 
-    _keyFocusIn(icon) {
+    _childFocused(icon) {
         let itemPage = this._grid.getItemPage(icon);
         this.goToPage(itemPage);
     },
@@ -1154,7 +1154,7 @@ var FolderView = new Lang.Class({
         this.actor.add_action(action);
     },
 
-    _keyFocusIn(actor) {
+    _childFocused(actor) {
         Util.ensureActorVisibleInScrollView(this.actor, actor);
     },
 

diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index bf8e081e5be182e71dcdeac3f1b1f934b590f131..a0d008386b4de8138f921b8524515e77b6954e46 100644 (file)
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -238,7 +238,7 @@ var IconGrid = new Lang.Class({
     },
 
     _keyFocusIn(actor) {
-        this.emit('key-focus-in', actor);
+        this.emit('child-focused', actor);
     },
 
     _childAdded(grid, child) {